More changes for aosp