Merge "Control WifiManager.MulticastLock from connectivity dev app" into nyc-dev