Merge "Fix NPE in NetworkMetrics"
am: cb0714332d

Change-Id: Icd844e6f04d93e9092b7fbf109ece537dfff4116