[automerger skipped] Merge "Moved transport to IntDef" am: c81c3275 am: 39be47a5
am: 2b510ee8 -s ours
am skip reason: change_id Id5d74b56a797c167e4560f5723a687fb979f3b77 with SHA1 3d405f6e is in history
Change-Id: I04d57235761785cdab65368cf7da2b08de851892