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

Change-Id: I671768311d2c2969bc5797efc43c84175b417ae7