Merge "Remove Ikev2VpnProfile shims usage"