[automerger skipped] Merge "Make it so client code does not tie tether to...
[automerger skipped] Merge "Make it so client code does not tie tether to wifi" into pi-dev am: f005640b
am: de5cc27f -s ours
Change-Id: I2b559714c89947bf38c50fbba97acdd4b1ef4dc2