Merge "ANW: fix an fd leak" into jb-mr1-dev