Revert "Revert "Merge with cm-11.0""

This reverts commit 3f50b9b5ceebcdc0945abb9536549dad7460b44e.

Change-Id: I6e4494244e20b78e4130233d6fcfb6a18a1856c7