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

Change-Id: I9d08addcc464ca68989b4a0c654c681eb5cf6347