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

Change-Id: I34fbe82455b113d2608f64f9220f5a1757e39627