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

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