Add changes for AOSP