Modify for AOSP pt2