Merge change 24858 into eclair

* changes:
  Don't wait longer than 10s for ping boxes to be ready