More AOSP fixes