Merge "Reuse the underlying byte array for ByteArray" am: 5efb83fafa
am: e224000cab

Change-Id: Ic3f264ce1191a4b6948a228aab1b817672bed2c5