Merge "Guard the SSID with NETWORK_SETTINGS" into pi-dev