am d21e24bc: Merge "Cleanup StateMachine LogRec handling and get tests working."

# Via Android (Google) Code Review (1) and Wink Saville (1)
* commit 'd21e24bccec8309839a264da95c5dc1573fc65c3':
  Cleanup StateMachine LogRec handling and get tests working.