Merge "Update NETWORK_CONNECTION_EVENT netId after WPS" into oc-mr1-dev