[automerger skipped] Merge "Moved transport to IntDef" am: 51a0d02853 am: c014859683
am: f4c86f5e07 -s ours
am skip reason: change_id I9234ae5ab87d3f0f21dd3bf5c1248d3f80c1f645 with SHA1 2e60e11183 is in history

Change-Id: I88aae29350e8c613ade4761127caf656086ac2c0