Merge "Add explicit cast to shut off clang warnings."
am: 79cfba55e9

* commit '79cfba55e9d1ff72930f2c10dd5805864baf4276':
  Add explicit cast to shut off clang warnings.