Merge "Fix NPE in updateNrState"