Merge "Remove an unused AppSearch-related target." into tm-dev