Merge UBSan crash fix from upstream

Bug: 313902875
Test: Treehugger
Change-Id: I275096fa83ddeb351a60c895b47e37fcbff670ab