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

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

Change-Id: I4407764b81619e091837481b037a6c2a0849f7a8