refix same npe, lost because of the qcril merge

Change-Id: I5e11f8cdd14c428e32f77e410383ca732e7da19d
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2