Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev