Merge "Act on credential storage updates."