Merge "Fix resource leaks."
am: c2f1b7f6ec

* commit 'c2f1b7f6ec2de6c0d50177e366240bb85f6d48b2':
  Fix resource leaks.

Change-Id: I221c57081d3f94fd91f57e90373db36727f873e1