Merge "Populating local addresses to local_net_access_map" into main