Merge "Fixing initialization cleanup in activity instrumentation test case"