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

Change-Id: I4e1299713b3425a5a86f927e58238aa6da2e7c65