Merge branch 'qcril' into cm-10.2
Change-Id: Iffff4df802216608187eedd82999cdfe5cca30f1