[automerger skipped] Merge "5G Q backport" into qt-qpr1-dev am: de809123 -s...

[automerger skipped] Merge "5G Q backport" into qt-qpr1-dev am: de809123 -s ours am: 368dddb0 -s ours am: 410bfd34 -s ours am: d3842a5d -s ours am: af56d4d0 -s ours

am skip reason: Change-Id Idb67fb7676adf9e1158113e7b8b08e655f470920 with SHA-1 32528740 is in history

Change-Id: Icb2b233a2feb5924191c0a8d40d6cf412448ed94