Test: Accessibility Scanner Fixes: 115582288 Change-Id: I1b02c06fa8d1461f9e26e8cca881cb3f2d0d8f1f (cherry picked from commit 13155ef2)