Merge "Fixing two issues in the accessibility CTS tests."