Add in missing curly braces part 3.

Everything else.

Change-Id: Iac02b144465b4e7b6d69ea22ff2aaf52695ae732
28 files changed