Merge "Fix ubsan error on unittest" am: b7e5a2246f am: dab9f37d4d am: b7db0285a4

Change-Id: Ie5e627fa7af26be5aa60672d364be17f520f48b3