Merge "Fix code under #if CONFIG_INTERNAL_STATS."