Could you please even include this change  to target adb to currentDevice as it throws error when multiple real devices/emulators are connected as well?
Thanks,
Swapna