Merge "Fixed Sonar issues in AAF_CM"