Merge "Second iteration of the UsageStats API" into lmp-dev