Fix handling of KM3 attestations. am: 4b93bb21dc
am: c0a93cc7b7

Change-Id: If1669772cba552f1ee31258e1b4c3b9fe94e7d9b