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

Change-Id: I668fe3095ee9184b50db83d8f52f572dc57cfa1f