Merge "Fixes fail test cases in AccessibilitySettingsTest" into udc-dev