DO NOT MERGE: CertificateTest: explicitly set validity check date
am: f26dd88f2f  -s ours

Change-Id: I871c99ac6b64ef92d240693b040cd07133f172de