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

* commit 'caf6497b9a0347da7d5acbe678adc2c8187176c0':
  Changes to support asynchronous close interruption