Merge "Fix InstrumentationListTestTest"