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

Change-Id: I3ee0f03e1d1dc8985fc2eea516dd80d902310f4c