Merge "Fix a bug in disabling wifi tethering on a wifi-only device."