Merge "Add getTransportFromManifest" am: 8ffa58d176
am: 551d747f1b

Change-Id: I391fad48298adb514f886de64564d522f125f6f1