[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b  -s ours am: 31b54b9803 am: 56020da601  -s ours am: 29104fe5eb am: 831a5ccc5d am: 65d2acbc9d am: 4f560b5165  -s ours am: b36e110e75 am: f3ae7333a4
am: 2d75226500

Change-Id: I2578cb9f06ea76b11a46d9654f2c2002e342628a