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

Change-Id: I62dcd82ec7dc1ef4b3fb9ab2c332f18581b7425d