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

* commit '43cb7ae6c31ced8cd518eab59dfea31ab1ade812':
  Cleanup: warning fixit.