[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 am: e382e65f am: 5ff1cda9 -s ours
am skip reason: Change-Id I337d4204afd9fbb790fd42cc191759b22dd66bca with SHA-1 3e5c35f3 is in history
Change-Id: I8ba9fe3e3a2a839d3e328424603551d70466afcd