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

Change-Id: I3e21ac2400682b104d056ae30c66402a119127c9