Merge "Consolidate a11y unit tests and get them working" into oc-dev
am: 101b151548

Change-Id: Iae2179b65f758779979e15937c9a0c6b6f6efa4b