Merge "Split network monitoring and portal probe events" into nyc-dev