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

* commit '37bd30bfd59a352452aea474ece764a6a14f71a9':
  ANW: fix an fd leak