More changed to make it play nice with AOSP