Merge branch 'qcril' into cm-10.2

Change-Id: I337c6669c5f5bc678a35887670e66d5aca08d978