In #29870 a new annotation for auto-configurations have been created. Update our existing auto-configurations to use the new annotation.