fix the init and startp state machine

Change-Id: I18a38888d4d44342d98b0b33205fb797db411094