Revert "Merge remote-tracking branch 'lx/cm-11.0' into HEAD"

This reverts commit 954ae42e9c65723f60f8a814349ba25145834777, reversing
changes made to 0950420170efc86efa9be3ebbbda8502cd390b2d.