Merge "Sonar fix: AAFcli.java"