a1933d7dfc
Merge commit '7fc5e5ab6d404d13136d30b724975798717f57f0' * commit '7fc5e5ab6d404d13136d30b724975798717f57f0': changes from Sync Manager API Review: bug 2164262