Merge "Fix testWaitForNetworkStateUpdate." into oc-dev