Merge "Return correct results in StatsManager APIs"