Merge "Set transport types to resolver" am: 3c0c668d87

Change-Id: I26b6e523bbc6ccd6e57a1b30782b74c6c33a7fbb
tree: bc9f9e47f692e7681cfdf37bbec871cc3f3ec5c4
  1. core/
  2. services/
  3. tests/