Merge "Remove incorrect annotation - @TransportType" am: 7f81046bed
am: 1e2e0892ba

Change-Id: Ia82a146de1afadcc415ba69fd5cf01480332b37f