Merge "[NS A41] Cut out a function to update NAI info"