Change getTransportFromManifest to getTransport. am: 20273f9b30 am: 7a3c229ea4
am: 6bdcf2134a

Change-Id: I77b0534c38e8403c89a71e7a4a4ddd1c7a4d2120