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

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