Merge "Update JUnit and InstrumentationRegistry imports" into main