Cleanup: Added braces on control flows with missing braces

GCP-10277

Reviewer: Daniel Villafuerte