am f0a68b54: am 8779c4ea: Merge "Minor cleanups."

* commit 'f0a68b54be5ba78466a7075a6d9a72438c25e645':
  Minor cleanups.