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

* commit 'c7a6e489f4b8c59a61784d8a982f04a1f3bd49da':
  Trivial cleanup of recent changes.