[automerger skipped] Merge "Moved transport to IntDef" am: b7463a63d1 am: f713c1ff26
am: bc8cc99b20 -s ours
am skip reason: change_id I1b513bcaaa0ebf47c14593d962579ed48a7c6db0 with SHA1 ef25faf013 is in history

Change-Id: Iae5ff42920f769ecfc9de290f513bd926e4de77b