Merge "Update v3_endpoint_type to use public"