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