[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b  -s ours am: 31b54b9803 am: 56020da601  -s ours am: 29104fe5eb
am: 831a5ccc5d

Change-Id: I74e3929ed6ee435c897a51607f03705d84423daf