Merge "Fix running CTS tests with Chrome Sync enabled"