Merge "Address pending comments for NetworkSecurityPolicy."