Merge "StatsManager: @Deprecated always-deprecated fields"