Merge "Fix sonar issue with nosonar annotation"