Merge "CTS secondary_user: CtsAssistTestCases"