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

Change-Id: Id54bf8a7b8506d62b839a42dd4ddd8c30185b547