Merge cm-10.1 branch into cm-10.1-mtk 

Merge new change into cm-10.1-mtk