Merge "adb: fix two device offline problems."
am: 2e821078e4

Change-Id: Iffba674a90dae88610541fe93c8df751e9ad63d2