Merge "Fixing comments in Network Capabilities" am: e58f15fded
am: 9b3c003c46

Change-Id: If3c0d76f9598d931d801271c4d0634e15f4b9ed4