Merge "[Test Week] Add missing @RunWith(AndroidJUnit4.class) annotation" into main