Merge "CtsSyncContentHostTestCases secondary_user"