Merge "Add NetIdManagerTest"
am: 4339cf3402

Change-Id: Ifbebb446601fcbbdf91fff48dc66ad173a6ecc7c
tree: 41a41bb7b6310f0f9e064f799e80eadd4dcb97b3
  1. core/
  2. services/
  3. tests/