Merge "Sonar Fix: NsAttrib.java"