Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev