Merge "Remove Ikev2VpnProfile related shims usage" into main