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

Change-Id: I5f649b54038b586be375394d35fd34453213df0a