Merge "adb: fix two device offline problems." am: 56af5828c8 am: 11f81780b8
am: 66cfd45a34

Change-Id: I8c1b066f8e69b9982066b6660886ebcde95842ce