Working on motorarm
Fix merge.
Cleanup related to MsgFrameState reference.