Merge "Add Test Network and Transport types"
am: 9a5d3ba1ad

Change-Id: I1cf33485adb9f4c442de42060697efe71bb45264
tree: 7daa9ddee24fb799156bd5fe4d1264606c881851
  1. core/
  2. services/
  3. tests/