Simple changes for Sonar warnings

Change-Id: I105e0cb90aa64dd7af6ac10a9a74d9e73e932a6f
1 file changed