am 5d3a382a: am 6d7af4b7: Merge "DO NOT MERGE Allow a custom component to handle network policy notifications" into cw-e-dev

* commit '5d3a382aa4c7d93df15aaa2cd9b1144c7c8d2d1b':
  DO NOT MERGE Allow a custom component to handle network policy notifications