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

Change-Id: I668fe3095ee9184b50db83d8f52f572dc57cfa1f
tree: 88ad56009f73f8bd12260e643c2eeabad63859a5
  1. core/
  2. services/
  3. tests/