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

* commit '98ff619d79dd213b21e0cb468d6432f0b4e153b4':
  Address pending comments for NetworkSecurityPolicy.