Fixed for aosp defconfig