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

Change-Id: I8ea49efafda34d89770a6090158cc177d993a37f