Merge "Reduce the timeout for waiting for the network state update." into oc-dev