Merge "CtsOsTestCases secondary_user"