Merge "Revert^3 "Remove hidden System.arraycopy(byte[]...."" am: 48874272ee
am: b425901a8c

Change-Id: I768aaad3f0c053be9654de4d4611ca4c9f403515