[automerger skipped] Merge "5G Q backport" into qt-qpr1-dev am: de809123 -s ours am: 368dddb0 -s ours
am skip reason: Change-Id Idb67fb7676adf9e1158113e7b8b08e655f470920 with SHA-1 32528740 is in history
Change-Id: Ie86ab3894946d6480033a84d781ace7b401a6faf