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