[AMOS commit] MDL-69588 accessibility: Address review points Committed into Git: 2021-08-10 02:29 UTC