Merge "Remove incorrect annotation - @TransportType"
am: 644939bad5

Change-Id: I99b74e5e67f5ff6f8d35f627e2c40ef4ca001c0c