Merge "fixed sonar issues in AAFResonse.java"