Merge branch 'qcril' into cm-10.2

Change-Id: I7294c85c86dfc8cb5d8130febf38753bb2f58a00