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

* commit 'bfb1d8a27532180dd08fc48190aed464abbdd8b8':
  Minor cleanups.