Merge "Fix InstrumentationTest onSaveInstance Test"