Merge "Update default max time of waiting for network state to get updated." into oc-dev