Merge "Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev am: 348c0155" into marshmallow-cts-dev am: 6bb2a718 am: e804e389 am: da01bba4 Change-Id: I3b18b6a3d17047174b540aa59c24f0dbadf79918