am 2d88862f: Fixing cpplint readability/casting issues

* commit '2d88862f0752a7a0e65145b088f49dabd49d4284':
  Fixing cpplint readability/casting issues