am 83fa3565: Merge change 7356 into donut

Merge commit '83fa3565896ed19846f6498c00de3cc9a29b1a57'

* commit '83fa3565896ed19846f6498c00de3cc9a29b1a57':
  Fixing a bug in how stop works - keep stop from always stopping