Merge "[SB Refactor] Fix handling of network transports in wifi repo." into tm-qpr-dev