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

Change-Id: Ie40f6e1428a7d3a98bb2b83bb6ac9f9224aa3de7