Merge "Fix a failing accessiblity CTS test." into lmp-dev