am af318e28: am 0b87c0d9: am bd08223c: Merge "Fix double close."

* commit 'af318e2882e0b8b1a594f079eb3d10b2daa3ff7e':
  Fix double close.