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

* commit '23e84565c7518ee9677a27425e9f8ce23ee860bb':