Merge "Fix NPE in NetworkMetrics" am: cb0714332d am: 34d08160bd
am: ca13c0553a

Change-Id: I66e07968b013c941706d4c772684fa8851e0ccf3