Merge "Small fixes to StatsManager API."