am 43b89c8e: Merge "Allocate buffers on the heap"

* commit '43b89c8e950479ac1164d95ddf478206e7f52568':
  Allocate buffers on the heap