Merge "Fix adb." am: 50d606528d am: ff6d1a9656 am: e95214c467
am: 5195499e97

Change-Id: I703868ed2083b1954fb1fc65f00b2b393dbcf664