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