AOSP override for KitKat and later only