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

Change-Id: I4f86c1cdb2445620b6d51070c019f0e63db6d590