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

Change-Id: I52035f859d8987117941d97d88366399007d7bd4