Merge branch 'cm-11.0' into omni-4.4