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

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