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

Change-Id: I5fe1dc941cdbce1a68b9c7ca8fee89089b82f3e2