Merge "Migrate OS tests to CTSv2"