Merge "Fix potential NPE" into cm-11.0