Merge t-qpr-2022-12

Change-Id: I07a61d3455f403b9d53fb82d671b3a3aaf0d9cc4
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.