Also add missing curly braces around variables. TrivialFix Change-Id: I8798ec52d9ddf76ad1f3debdf087ed4f51defc38