am 58a9cd16: am 97ea590b: am 9aaba5ca: am 8c6b9b0d: Merge "Fixes some warnings"

* commit '58a9cd1681688e031ef0642842d326da7d2a4934':
  Fixes some warnings