Merge "Robolectric mass migration (smaller)" into main