Merge "Merge "Stop using Arrays.checkOffsetAndCount. am: 60f55a255f" into stage-aosp-master am: 72629d9999" into pi-dev-plus-aosp
am: cb45faa86e

Change-Id: Ibabe1fec3050f26e0a3182077180009ccd3271ad