Merge "Use autogenerated StatsLog that is Q-friendly"