Merge "AafConnection.java: Fixed sonar issues"