Merge "Migrating additional system robolectric tests" into sc-dev