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