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

This reverts commit 9bcb7d2a6b78aba13610ff46f8380f1d3e9d21ef, reversing
changes made to 3c37f2b0f230ee0f2b9d9585db1827588bb9aaab.