am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."

* commit '4f362e438c6ee5688c4f2f444203ed7acffa566b':
  Cleanup: warning fixit.