Resolved some sonar issues: Simplify Boolean Expression

Change-Id: Ie4d9efb2a00330bede69aac80789065cac895710
Signed-off-by: Ladislav Borak <lborak@cisco.com>
Merge "Resolved some sonar issues: Simplify Boolean Expression"