Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)"