Fix sonar warnings

Change-Id: I951229adb6ea2574546183092eaf5456c4a300a8
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Fix sonar warnings"