Merge "releasetools: Fix a mismatching close."
am: 395bf274b8

Change-Id: Idb5281ccc04e440fccec474e2d12c3443db1df9a