Revert "Merge with cm-11.0"

This reverts commit fd4e67842cb83160fcb16d9f8a0fc32a71b143a9.

Change-Id: I4938834999d2ecaa18c442126b635674cc73b56f