Merge \"Fix for the missing sync bug\" into nyc-dev
am: 70b6cd903e

Change-Id: Iea3af329cf5aaf370c4454ef35f8c35c36b6d04c