Merge "CTS secondary_user: CtsNetTestCasesLegacyApi22" am: 6b0d4eb1a3 am: 6af15ecacf am: a7e7cdafd3
am: bbcf1eeae0

Change-Id: Ia5a6a816f144e80f48d8b7132f711564e4d6df88