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

Change-Id: I63bac11c75c74667e87d3e51d519e7583c9a6b56