Merge "Deprecate NetworkInfo" am: a244ccd86d am: df8ed1524d
am: f3176ea037

Change-Id: Iefce7f71ac10d0b9c96ce7d6af345e96880cfa1c