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

Change-Id: Ie7c626930c54f487ebf3b34ed714713952e9c03c