Merge "Add a new ssid field in NetworkCapabilities." into pi-dev