Merge "Minor type cast fixes for UBSan" am: dd1492e588
am: cce6caac11

Change-Id: Ib5a9a51c0be413a3a6dfa8bcb14c961f656e97ff