Merge "Remove deprecated legacy credentials provider"