Merge "Make it so client code does not tie tether to wifi" into pi-dev