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

Change-Id: Ie40f6e1428a7d3a98bb2b83bb6ac9f9224aa3de7
tree: a104cd27fc796939851adc47b7380ce23ab9ddea
  1. core/
  2. services/
  3. tests/