Merge "Deprecate NetworkInfo" am: a244ccd86d
am: df8ed1524d

Change-Id: Ia646a8754bcd5ef62573e3b1730df3987bf9fd15