Merge "Add removeState method to StateMachine" am: 0310de1136 am: 01106c45ca am: 1a8bdf8bf9
am: a95fc5fea8

Change-Id: I725b9456623d5781eff2c59abaf0d07c25dea252