Merge "Sonar fix: NS.java"