Merge "Fix for Sonar bugs Signed-off-by: Bindya Narayan <bindya.narayan@intel.com>"