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