correct more sonar rules

Change-Id: If15b8c9dc90e28e3845ea411d2a5caf537d78174