Merge branch 'qcril' into cm-10.2

Change-Id: Ic76b31f63f6fd0a6aaababb83bf42fa946e497c4