Updates for AOSP compatibility