Merge "Update shims for building an Ikev2VpnProfile from Builder"