am b21bd772: am a62eac5c: am 50f192fa: Merge "Fix "adb devices -l"."

* commit 'b21bd7729137d5c2894b4425609d07f48f36d460':
  Fix "adb devices -l".