Merge "adb: fix two device offline problems."