Merge "Fixes typos for adb shell stop/start."