Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev