Merge "DO NOT MERGE Allow a custom component to handle network policy notifications" into cw-e-dev