Merge "getTransport checks both manifests." am: 1957f7a07f
am: d05118a3c0

Change-Id: Ibc4bf30d09b362ed5e399c55f992523f05b17fa8