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

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