Merge "Migrate AA+ Search related files" into sc-dev