Merge "Changed config_wifi_hotspot2_enabled to false." into mnc-dev