further AOSP->CM updates