merge cm-11.0 into kk4.4