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

Change-Id: I54cbb26c9f68edb07aca4e8054750c665a33098f