changes from Sync Manager API Review: bug 2164262
5 files changed