Merge "CP a11y CTS fixes from master" into oc-dev