Merge "Add CTS tests for the new UsageStats API" into lmp-dev