Merge "Fix accessibility button CTS test" into oc-dev