am bd08223c: Merge "Fix double close."

* commit 'bd08223c450a7a2e8e8d79e6be148ed1ac64caa3':
  Fix double close.