Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"