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

Change-Id: I813f711504c1dda84ae6d8d2119c5cf4e7fad8f1