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

Change-Id: I263a7f93b33a378b0a90c9b377824e6c51c7c654