am 63696738: am b6a97196: Merge "More cleanup."

* commit '63696738e5d0684fb1e769c541fba2e552c5110a':
  More cleanup.