Cm 11.0:native upstream changes