Merge "Add Test Network and Transport types"
am: 0dddb902ae

Change-Id: I1cf33485adb9f4c442de42060697efe71bb45264