Merge "Remove incorrect annotation - @TransportType"