Merge branch 'cm-11.0' into kk_mkt
Merge branch 'mokee' into HEAD