Merge "Merge "Add removeState method to StateMachine" am: 0310de11 am: 01106c45 am: 1a8bdf8b am: a95fc5fe"