Merge "Improve attestation record unit test."
am: a808cb53ed

Change-Id: Ic16d66847d052bc6df5075a02731d7a0895efa66