Resolved some sonar issues: If Stmts Must Use Braces

Change-Id: I904bf50a98ba72f6887c540970a10b951c4f8beb
Signed-off-by: Ladislav Borak <lborak@cisco.com>
Merge "Resolved some sonar issues: If Stmts Must Use Braces"