Merge "[SB Refactor] Account for underlying wifi networks in old pipeline." into udc-dev