Add a delay before scheduling local syncs am: ba1f790369 am: 50a22690f8
am: 471384106a

Change-Id: Iec0a0623c1086fb0e8ef738bdcd1185395539e0b