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

Change-Id: I4868e49b461a0e1990827acdcdd29279b988bd34