Merge "Sonar fix: AAIClient.java"