am eca3eb59: Merge "Don\'t create weird ByteBuffers"

* commit 'eca3eb5983fb8e8cea17175869f86cda7613dd60':
  Don't create weird ByteBuffers