Merge \"Reject PKCS#7 SignerInfo with unsupported parameters.\"
am: 21213cff9c

Change-Id: I9bec518914d7e2eff978dc7d189eb5641148f5ad