am 85075869: Wait for buffers to drain

* commit '8507586903fa803abf535853a169913f2cf2e555':
  Wait for buffers to drain