Merge "Add NetIdManagerTest" am: 4339cf3402 am: 99fb017643
am: 6bbee11f5e

Change-Id: Iea5c3d1ab35678edf25f103e54784ce8ab49ca12