Merge "Stop using Arrays.checkOffsetAndCount." am: ca3450b524
am: ca2bafa5b7

Change-Id: Ia3f37588850943854ceb95b32117d051442b05fd