Merge "Pass upstream prefixes to bpf tethering offload" into main