a few sonar issues

Change-Id: I0b55773c1cd13354e480be5fa7454fc431cf603f
2 files changed