Pulled more xstate stuff with REMOVE_SIM
Pulled more xstate stuff with REMOVE_SIM

mklight/eCMD,open-power/eCMD,mklight/eCMD,open-power/eCMD,mklight/eCMD,open-power/eCMD,open-power/eCMD,mklight/eCMD,mklight/eCMD,open-power/eCMD