Modify error message
Reviewer: Dan Jao (post-commit)
Issue: GCP-9396, GCP-9397