Merge "Detect and fix resource leakages in tests"
am: 1151f73cc6

Change-Id: I94dc9ee436e836215c02c93dbbd57d5214d57827