[automerger skipped] Add transport types to a given network am: 340bb8d5 am:...
[automerger skipped] Add transport types to a given network am: 340bb8d5 am: 660c4e54 -s ours am: d9577556 -s ours am: 1f93dac3 -s ours
am skip reason: Change-Id I337d4204afd9fbb790fd42cc191759b22dd66bca with SHA-1 3e5c35f3 is in history
Change-Id: I24bfa0721db726323e1c3202d18b1523542ca799