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

* commit '0b87c0d9e074384d05e6563c1b1cf5dbd5246436':
  Fix double close.