Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev