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

* commit '493eaed7fe40455562607b10fd7997581341dd7b':