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

Change-Id: Id3496854f185325d01ada24b0f29b1ff60adbd6a