Fix NullPointerException issue when user change

When info is null, we have risk to have access null point.

Change-Id: Ie6acee5c99d6297e31d46585435a735a38b19e82
Merge branch 'cm-11.0' into kk_mkt