Merge "DefaultNetworkEvent metrics: rehaul"