Merge "Fix resource leaks." am: c2f1b7f6ec am: e4502b86dd
am: b5d60ca5c3

* commit 'b5d60ca5c3e1d3d9b8cc39033bfc1019c421aba9':
  Fix resource leaks.

Change-Id: Iffa1473f802d4d9ff65f92ce239762315fc64e24