Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96

Change-Id: I4dcfff1c7d13036039d49a56b1a2f123aa0f1b9d