am 620f348f: am da69fdbb: Merge "Fix buffer allocation"

* commit '620f348faf3ce0c39e71338a005f1528765f4d1e':
  Fix buffer allocation