am 12eb17b4: am 3ff6dd93: am 8b1a94c0: Merge "Cleanup old-style-cast warnings"

* commit '12eb17b40be9247de8717a4edfb3619d6535e8c4':
  Cleanup old-style-cast warnings