Merge "Remove the network capabilities which are added twice" am: 931234b4 am: 4c90111d am: eb9542bd am: 69de2142 Change-Id: I4868e49b461a0e1990827acdcdd29279b988bd34