Re introduced commit for fix; also added % to symbols to watch out for

GCP-8901

Post commit review : Dan J
Re introduced commit for fix; also added % to symbols to watch out for

GCP-8901

Post commit review : Dan J