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

Change-Id: Ic42f7d98f39ed848ffb2e6423671277fbde7ac99