Merge branch 'cm-10.2' into jb-7.7
Merge branch 'jb-k3.4' into jb-7.7