Merge "Update UsageStatsManager Javadoc to match implementation"