Merge "Remove NetworkIdentitySet usage in CTS"