[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d3 -s ours am: 31b54b98 am: 56020da6 -s ours am: 29104fe5 am: 831a5ccc Change-Id: I74e3929ed6ee435c897a51607f03705d84423daf