Merge "Resolved below sonar issues:"

No match.