[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6  -s ours
am: e0f30ecdb9  -s ours

Change-Id: Iffa0c61e06cbfe2e66912c26b0a3d81660bc5a91