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

Change-Id: I86e78194b5a123a7d51bdf4ed248b181da688774