updated for aosp