Merge "Fix a regression in sync manager" into nyc-mr1-dev