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

Change-Id: I3aa2a2d313f8aa9b77dbad556578700596a0cc1e