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

Change-Id: I8cc18e571f1791845aa2add426fa93a9f7520de7