am 07044c1b: Merge "Convert ByteBuffers to byte[] correctly."

* commit '07044c1b869e32b69bf6afa1a9f328fbcdf2404b':
  Convert ByteBuffers to byte[] correctly.