Merge "Moved transport to IntDef" am: b7463a63d1
am: f713c1ff26

Change-Id: I9a68e86efd37018db87dfb09af58fba8b99c3b15