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

Change-Id: Ia2ac4ae5f61533e3121e6a0950aebceb62cb1f84