am 0af9fb52: am 236afa0d: Merge "Fix issue #10747324: adb install hangs" into klp-dev

* commit '0af9fb526b67ddb2d7f55dabef4379f46b622d57':
  Fix issue #10747324: adb install hangs