Merge "Deprecate getNetworkType" am: d47ae01063
am: 40ae3d6281

Change-Id: I6f07d8a9766a89a6b2905124f00a1abd7bf1f4a1