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

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