[DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8 am: cd1be81d25  -s ours am: 451bcb50c7
am: 656a8b9459

Change-Id: I86e856148ffa98658daff875705519770aeb0b64