am 14de0880: Merge change 23698 into eclair

Merge commit '14de0880dd7b716f39b822917e874ca5e579ff37' into eclair-plus-aosp

* commit '14de0880dd7b716f39b822917e874ca5e579ff37':
  suppress syncs until boot is complete