Merge "Refactor NetworkSecurityPolicy to be pluggable"