Merge "Changes to enable overriding the OSCreds for tests."