Merge "Fixing the other half of the accessibility CTS tests." into jb-dev