Merge "Deprecate getNetworkType"