Merge "Improve attestation record unit test." am: a808cb53ed am: 51810040dc
am: 33eb2b31cc

Change-Id: Ie606fc55e99d5982152a5ff11c449507ca1e68c8