Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev
am: 964874e444

Change-Id: I86e665b3aee0d01dcbec3040e51efeb60b8f2f0e