Merge "handle wifi interface changes with interfaceRemoved" into nyc-dev