am 683cf1bf: Merge "Changes to support asynchronous close interruption"

* commit '683cf1bffe33f49f26d46201f96cd2eff60e8192':
  Changes to support asynchronous close interruption