Add getTransportFromManifest am: fba2495bc6
am: f8b66c8137

Change-Id: I3396f9a2c1a8cd272bd47d307be0be372f9dbba1