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

* commit '389bf4b3319734ac5c529a62d49084594702e614':
  Use the right fd for flush call