Merge "Merge "Stop using Arrays.checkOffsetAndCount. am: 60f55a25" into stage-aosp-master am: 72629d99" into pi-dev-plus-aosp