Merge "Handle more commands in StoppingState" into nyc-mr1-dev