Merge "CTS secondary_user: CtsRoleTestCases"