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

Change-Id: I80a3e83817afa5cd1f45f4194fcd03ee3b85fcb2