[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625 am: 2d54d2c0 am:...

[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625 am: 2d54d2c0 am: 305a41b7  -s ours am: e0f30ecd  -s ours am: a482ac81 am: b50794ec  -s ours am: 9d291443 am: 467a8d80 am: d08ec589 am: 1b17c98b  -s ours am: bcd2b1ff am: be28d26a am: 2695147f am: ac2c68df
am: 03f88b2f

Change-Id: Iefe4667d3a4347aeea87e6b736882013c560eaed