Merge "Require actual certificates for testNoAddedCertificates."