Merge "Fix issue #10747324: adb install hangs" into klp-dev