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

Change-Id: I47250a4593af4d803942e0ac736b7c0625b6ee70