Merge branch 'qcril' into cm-11.0

Change-Id: I7a00deac85815d672a84ceb22bdba61b755f8945