Simple changes for Sonar warnings

Change-Id: Idba9a9fcbdb0c606cf8a94bf23ac65aa942a6e5a
1 file changed