Merge "Revert "Broadcast credential storage changes.""