Handle more commands in StoppingState am: 8ec1dc8117 am: 103eeee194
am: 7686b9f03c

Change-Id: Id0ff5ad628c6569667e4bfaf2efa35bf47a11904