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

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