am: c2f1b7f6 * commit 'c2f1b7f6': Fix resource leaks. Change-Id: I221c57081d3f94fd91f57e90373db36727f873e1