Merge "Convert ByteBuffers to byte[] correctly."