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

Change-Id: I8e11ab25744c48faa5831a0974bf6fb711482acf