Merge "Make UsageStats API comply with API Council" into lmp-dev