Merge branch 'cm-11.0' into slim_kk4.4