Merge "Fix "adb shell cmd user" output."