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

Change-Id: I24c870cce6f3ef352afc3c6a1f6ac8c03a0991e1