Merge "Fix various adb error reporting bugs." am: 8dead17a58
am: e6b808ea5b

Change-Id: I3cfa0382ecb4f22c7de33d5bfa10d6f8d5679408