Merge "Add tests to verify UsageStats persistence." into rvc-dev