Merge "Add ConfigNetworkSecurityPolicy" am: 2786002bd5
am: a35d617cce

* commit 'a35d617cce6c9b1b1cba7e7c786849d21ea42d3e':
  Add ConfigNetworkSecurityPolicy