Merge "Add StatsUtils method for handling subtype change."