Merge "Revert "Small fixes to StatsManager API.""