Merge "sonar-AAF_Locate.java"