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

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