Merge "Fix various adb error reporting bugs."