Merge "fixed sonar issue in AAIDeclarations.java"