am f7baffd1: Merge "Make sure the drain buffer is big enough" into jb-mr2-dev

* commit 'f7baffd1fce85e3cac464b0d2ad6bc600836abf8':
  Make sure the drain buffer is big enough