fix npe issue during import
Reviewer: Dan Jao (post-commit)
Issue: GCP-8970