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

Change-Id: I3a00c9b514620fd29fc30ab907406c2137347808