Cleaned with brake cleaner and swapped the solenoids. Before, I heard the marble sound right after starting up. Now, I started the car, no marble sound. Half hour later the sound came back but much much less than before. Maybe one or both solenoids are bad. I'm going to get at least one and swap them one at a time.