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

Change-Id: I05162b4d46592b35c91a6be27be7e6e27ff72fa4