Merge "Moved transport to IntDef" am: 51a0d02853
am: c014859683

Change-Id: Ia05bc2d2b5e77a0e8ac72eb76379d7af696f544d