Merge "Add Credentials Provider factory"