Merge cherrypicks of [9372739] into qt-qpr1-release

Change-Id: Ib0a6069fd9daa1ad9137d5c80d052ea05250015b