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

Change-Id: I210c43e8778e807c91fcbdee446157af4cc40834