[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: 3d421b5a -s ours am: a5a27aa7 -s ours am: 94da4006 -s ours

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

Change-Id: I09471227a3f8a07f4607bc9f652d0a1420b54509