Merge branch 'qcril' into cm-11.0

Change-Id: Ibdfee257c2ebeb8d913ee5bba93ea707260c290a