aosp initial conversion from CM