Merge "Cleanup StateMachine LogRec handling and get tests working."