Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e am: d03d6628 Change-Id: I4e6813fe53b8a0a6c19a182b5c412b3054415a5f