Merge change I94132420 into eclair

* changes:
  Fix network-feature timeout code.