Fix Sync

Change-Id: Iae7d2553316e0ca922a5f6e0df6bb638d867cf5c