Merge "Deprecate getNetworkType" am: d47ae01063 am: 40ae3d6281 am: 9d8c21fba6
am: ebcb57fb17

Change-Id: I06080b5536c8bdf3cbdf8c8351b202e892ca36f9