[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 am: 9d2914436f am: 467a8d802f
am: d08ec589b2

Change-Id: Ibb3d3fda0d83b0f1e87c22442628d462ed889dd6