Merge "Sonar fix: Attrib.java"