Merge change 23698 into eclair

* changes:
  suppress syncs until boot is complete