Fake tasks refactoring using FSM - initial

Change-Id: I8129f5855fc170b6e6319733e04c05ac537fabc4
Merge "Fake tasks refactoring using FSM - initial"