Merge "Add the clear credential provider API"