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

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

Change-Id: I3b03cf1473827082f3799d7e86544703bdfc9857