Merge "adb: fix sync."