am 2ca0424b: am 3d193137: Merge "Clean up some warnings"

* commit '2ca0424bfd75f148634a10c6ca19f1e20d45a7a2':
  Clean up some warnings