Merge "Handle more commands in StoppingState" into nyc-mr1-dev am: 9ed777d03d
am: 6569c05f02

Change-Id: If26e1f3416b5b3df41bdec8829faed047bfcebd6