Merge "Use FrameworkStatsLog instead of StatsLog"