Merge "Avoid NPE when missing network stats." into ics-mr1