Merge "ADD new enum NetworkType to identify multiple transport type" am: b4562568c8

Change-Id: I6139c33252cae0a9b041fe3b47e12ceadfe6367f