Merge "Revert "Use FrameworkStatsLog instead of StatsLog""