Merge "Revert "Revert "Update the UIDs only after the native network is created"""