another fix of device sync

Change-Id: I9cbd1f55855249bd6bc1106767fcb7ffbc636209