Merge "Moved transport to IntDef"
am: 51a0d02853

Change-Id: I2b209e1d7a81db9e715097980aa180d22f0226c6