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

Change-Id: Iff2fefe13f14d524cf5eb22c314d7dee50f0f9e0