(This is a merge of http://go/wvgerrit/134403.) Reported as errors by UBSAN Bug: 194971260 Test: Ran ODK unit tests Change-Id: I2f38fb6952d259458af8498e86b3308421e93320
(This is a merge of http://go/wvgerrit/134403.) Reported as errors by UBSAN Bug: 194971260 Test: Ran ODK unit tests Change-Id: I2f38fb6952d259458af8498e86b3308421e93320