Merge "Handle hostapd and tether interface changes"