Merge "Improve some adb error logging"