Merge "Deprecate most of NetworkInfo." into pi-dev am: 12c1b569af
am: 4b88d3bf3e

Change-Id: I782db7532da8c892516b967f3ff0756f18968ed5