Merge "Sonar fix: LeafListHolderNode.java"