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

Change-Id: I62a07cf2d917fae23a698f84bc0dd33e17a77c6f