Merge "Deprecate NetworkInfo"
am: a244ccd86d

Change-Id: I4ac76b4bb3edb85e22440c8bfa4f0979c42c0cbd