Merge "Properly disable WiFi tethering" into nyc-mr1-dev