fix device sync errors

Change-Id: I8edaabf93029911673a52dcd084c3ed43605b7f3