More aosp changes