Merge "Fill in the new ssid field in NetworkCapabilities." into pi-dev