am 3d193137: Merge "Clean up some warnings"

* commit '3d193137da53cbd1fd53e875696e0896822f604d':
  Clean up some warnings