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