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

Change-Id: I0f57a66ce33a44e56568a7a53f71424f032ff3f1