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