Merge "Don't allow an external service to be an A11y service" into tm-dev