[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

Change-Id: Id3539dbbf3a76ed6b12212853afc23ec9ef91e8f