Merge "WifiManager: Remove static objects" into mm-wireless-dev