Merge "StateMachine: add getLogRecMaxSize()" am: 22e43471ed am: 0a2d5cf7db
am: 313604b48f

Change-Id: Ib8670d744b179a48dd3f9052baefc9ddbf260274