Adding in explicit adb install
Moving back to Android 21