Merge branch 'qcril' into cm-10.2