Merge "Revert "Act on credential storage updates.""