Merge "WA: Fix adb wait-for-device command" am: bf867cac7e
am: 4da27b1014

* commit '4da27b101499c59eb85e9650a97a7b2f980a2dee':
  WA: Fix adb wait-for-device command