Merge "Optimize a11y service capabilities"