Merge "DefaultNetworkEvent metrics: rehaul"
am: 69c9402a29

Change-Id: I7a5d45feb2315779dad4b0a4f69e761eb90f4ed6