Merge "DSPManager: AST translations" into cm-11.0