Convert from CM to AOSP