Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586 am: f35ccd22a1
Change-Id: I2bfa3d9a0eff2a1f0ca3fb6245ec0a51dacfa11b
This commit is contained in: