Merge "UsageStats: Addressing API review comments." into main