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

Change-Id: I5b57674eccd5e84bde033bb3277f88d86349a6b3