Fix potential NPE

Change-Id: Ic2c7243601b0830e0532818b2f4007d9c10e0de8
Merge "Fix potential NPE" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD