Merge "Fix test_hotspot_upstream_cellular failure" into main