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

* commit '835526fdc035cad6d712a7098d0eae37b3995d2c':
  Cleanup: warning fixit.