Restored ? as part of the characters to watch out for during validation

GCP-8901

Post commit code review : Dan Jao