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

* commit 'd292ed866c27bc7a23cfa292603d722a6b7f9d81':
  WifiManager: Remove static objects