Merge "Revert "Extract out common adapter logic to support different Al..."" into tm-dev