Merge "adb: fix deadlock." am: 68599f5759 am: d5a2cdb72c
am: a08c949c7a

Change-Id: I2e4c442084c710444de0192b2d4bc901c17fc92f