Merge "Remove clearDefaultsForInactiveSubIds."