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

GCP-10282

Reviewer: Crisjaira Villarino