Bug 553113 - [quick fix] Add surround with try-with-resources

Change-Id: Iafef5e6b006aaaf553d785e246e76f8dcea29522
4 files changed