Merge "Migrating all model tests to Instrumentation tests" into sc-v2-dev