Merge "Merge "Migrating all model tests to Instrumentation tests" into sc-v2-dev am: c817d2a633 am: 886adad609"