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

Change-Id: I189a0d980ec51e48237e19670bcd863fdfbd909a