Fix AccessibilitySettings

Change-Id: Ie85caf880a103deb883b807b10f5b53b51cd8f59