Fix the import and the alignment

Reviewer: Tiff Go (post commit)

Issue: GCP-8902