Merge "Fix ubsan error on unittest" am: b7e5a2246f

Change-Id: I628e2681456a5a8df52801f6b452d235d6ae4614