Merge "CTS secondary_user: CtsOmapiTestCases"