Add missing curly braces

Change-Id: Ide28dfdfa1d5465d09b97cb9f072c4657393ae50
Merge "Add missing curly braces"