Merge "Add explicit cast to shut off clang warnings." am: f091dfe010 am: 8893c66d35
am: baec2d25f6

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