Fix for Settings for AOSP