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

* commit '3ff6dd938b33345c5be601dbc763cf7664cecec4':
  Cleanup old-style-cast warnings