Cm 11.0 aosp additions