Merge "Revert "CTS_v2 migration for Preference2 tests""