Merge "Migrate AAF to SonarCloud"