Merge "handle wifi interface changes with interfaceRemoved" into nyc-dev
am: 602123a

* commit '602123a14ac316fe0d08a9417f3d38f7d566c83b':
  handle wifi interface changes with interfaceRemoved