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

Change-Id: Ib19d86fae333c7d363bc30e90a94027aefc91022