am d4a2e7c4: am ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy."

* commit 'd4a2e7c4040fdcd114cfa50293504a602bc3b8b4':
  Address pending comments for NetworkSecurityPolicy.