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

Change-Id: If538baf7cde4af76a221109d3bf2619ee48c9ed0