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

Change-Id: Ifea6d9380bfbfeb3ca5a35874c51fd1f5fdef6b0