[automerger skipped] Merge changes from topic "locked-key-attestation" into qt-dev
am: 2241ae2c4f -s ours
am skip reason: change_id I3460785833f8c3298acadc2e1a8868a166fba5fc with SHA1 00eddff7eb is in history

Change-Id: Ib2adad08f129ff8e5c1ea8f5ca718ba589a4dd26