new sonar rules corrected

Change-Id: I3414a0e05206c68e22d9bf9c76251aaf4013265f