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

Change-Id: If91f2edc57109308b34be67b9f3861b84147153f