initial aosp conversion from cm