[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
am: 165baf64de

Change-Id: Ieb30eddcdb42c22be23ba1f239604654a94a7b3d