Cleanup: Added curly braces on control flows with missing curly braces

GCP-10278

Reviewer: Mae Turiana