Merge "Refactor NetworkSecurityPolicy to be pluggable" am: 224318aa13
am: cea1cf0185

* commit 'cea1cf0185b8c9fb4582936844326b385fb385a8':
  Refactor NetworkSecurityPolicy to be pluggable