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

Change-Id: Id73278e624913685d10d008741c908dc5e4a5fd6