Merge "CTS secondary_user: CtsNetTestCasesLegacyApi22"