Merge "Add NetIdManagerTest"