[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: 3011ff18 -s ours am: 8c51e5d8 -s ours am: 6caaa6ff -s ours

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

Change-Id: I7acf720a51ce649e46dcc811f10b08798861b45c