Others changes for AOSP