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

Change-Id: I4f31491b1c9db29fe14222788d7fbd1fd6bce068