Merge "Sonar-AAF_FS.java"