Merge "Add comment for NetworkStack permissions" am: 154a0d0b38 am: b4493ea049
am: 0737917d03

Change-Id: If9c8d887e04bf173badb6b147d9a4379daf6d93f