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

Change-Id: Iecaf28d9d8df6d202f67a6393f1255d65c24dd64