Merge "Rename the usage of UsageStats API" into sc-dev