Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf
am: 815c681f42

* commit '815c681f4243486693830929bf1be472ae1f467b':
  Use correct cert chain from PKCS#7 SignedData block.

Change-Id: I01cb9b5f0fb409d5f03120b6cdfca9077b7bceb2