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

* commit '8b1a94c07cb02a0398238ebaab4a2a0a23f7d28c':
  Cleanup old-style-cast warnings