Merge "adb: Recognize rescue mode." am: f072aaffe0
am: ff460d7fa8

Change-Id: Id617e014b74d0f090aaf0ce04c44f4de743595d0