WAI-ARIA field corrections (#11407)

Implementation of suggestions from usage test by an screen reader user

Change-Id: If02512f3d4ee60e3e115023af9d9e600dc11321a