am 2063f8e1: am c7a6e489: Merge "Trivial cleanup of recent changes."

* commit '2063f8e1014d63c83145b70f0cf6fb5d74787ac6':
  Trivial cleanup of recent changes.