Modify for AOSP