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

Change-Id: If22b44893c33c3640a85eed7e6dc0ce888018059