am 251b11c2: am 85075869: Wait for buffers to drain

* commit '251b11c2045b2ae97f2ab270a65e11b4ca49b1b6':
  Wait for buffers to drain