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

* commit 'af9e9d97ee7a53fd5f315ac16b63cc41a3207c33':
  Minor cleanups.