Merge "Update to use new UsageStats API" into lmp-dev