Adjust for AOSP