am 4f88ff48: Merge "Use the right fd for flush call" into jb-mr2-dev

* commit '4f88ff48ee99b5e7078f7a6b774d21a3f3434bb9':
  Use the right fd for flush call