refactorings for abstract FSM interface

Change-Id: I527dc0c2a00d40873385e707e279254114d7a998
89 files changed