am 6d7af4b7: Merge "DO NOT MERGE Allow a custom component to handle network...
am 6d7af4b7: Merge "DO NOT MERGE Allow a custom component to handle network policy notifications" into cw-e-dev
* commit '6d7af4b7':
DO NOT MERGE Allow a custom component to handle network policy notifications