am 61f87bcb: am 14de0880: Merge change 23698 into eclair

Merge commit '61f87bcbd679cd2c75c68be02ceae0717f0ef4e0'

* commit '61f87bcbd679cd2c75c68be02ceae0717f0ef4e0':
  suppress syncs until boot is complete