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

Change-Id: I8c1b066f8e69b9982066b6660886ebcde95842ce