Fixed sync errors

Change-Id: I510a52928087bd1177d26682daa3b039716957b0