Merge "Update Network & internet->Wi-Fi to use MasterSwitchPreference."