Merge cm stuff

Change-Id: Idf20c3b4cf99e6a7ecfa3619dc44ff5d3882f0ea
We are Kylin

Change-Id: I5c0a467d85d90a93a84f2388e226869f58c68c7c