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

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