Merge "Merge "Deprecate FileUtils.closeQuietly" am: e4b84f3475 am: 769cf05c56 am: 17fac19d82"