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

Change-Id: I44afb003967de980aef74d40334c4876d8988c75