Merge "Make sure mWifiManager gets initialized" into nyc-dev