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

* commit '97ea590b4f55c1ee3998d1f17c06a7e7a27821e8':
  Fixes some warnings