Merge "[WIFI] Restore initialization code"