Merge "Change adb root error handling."