Merge "Fix Keymaster VTS unique attestation failure"