Merge \\"Wrap closeQuietly() on finally block.\\" into nyc-dev am: fb5995cfbb
am: a18a63b23a

Change-Id: I3e6769579e08887888b1358be0cb695f32e13749