Merge "Reduce the timeout for waiting for the network state update." into oc-dev am: f345a436be
am: a2ebd80d84

Change-Id: I56ac6f7e3c5ba725b087a69d38b68f41392c5a77