Merge "Update Attestation format to KM4" am: 9d6d7b83ab
am: 3ae951c611

Change-Id: I926dc2268772542f25bef13e7b22558d0298f4c0