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

* commit 'e4502b86dda440fd2d55649aa72b32444b3f749b':
  Fix resource leaks.

Change-Id: I78d368b68e67412836156b952f01cf691c7400a9