Merge "bootstat: Add more debug logging metrics to RecordFactoryReset." into nyc-dev