Fix Sync issue

Change-Id: I244f1c95abc2a202c4d9a213254260f881d8cf6d