Merge "Fixes typos for adb shell stop/start." am: 9786fbb9d3
am: 6c54d3cabc

Change-Id: I901448804e4dd6103acb9d67c8ee05dfa4b146f9