Merge "aac remove diag"