Merge "Centralize bounds checking and don't overflow" am: fc9b8b8f0d am: d63d621174 am: 1a87751cdc am: de3e90c01a
am: 2de772f824

Change-Id: Ie3780cc05a4bab31793d8dc7c0a7350ff3458702