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

Change-Id: If7f57fc24bc60e8fa990e43fed483576d5451282