Merge "Fix build issue with stats enabled."