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

Change-Id: Iad8268118899d21bf665d64b61e1cb1c4f49ca7e