Merge "Remove the network capabilities which are added twice" am: 931234b451
am: 0509d84915

Change-Id: Iad8268118899d21bf665d64b61e1cb1c4f49ca7e
tree: 2ac857ebfa691a2b6ead7480cb9858c01f447040
  1. core/
  2. services/
  3. tests/