Merge "AAFcli.java-Merge the if statement with the existing one"