am 9aaba5ca: am 8c6b9b0d: Merge "Fixes some warnings"

* commit '9aaba5cad1197a16c6af13bca76fbc95eeb25ca7':
  Fixes some warnings