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

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