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

Change-Id: I82636cf59d6b24fe3bba71e2fa5f5dfb2f183de9