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

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