Merge "Move CQ operation name from actor.aai to aai"