Merge "Use the right fd for flush call" into jb-mr2-dev