Merge "[NS A41] Cut out a function to update NAI info"
tree: 88ad56009f73f8bd12260e643c2eeabad63859a5
  1. core/
  2. services/
  3. tests/