Merge cherrypicks of [8011043] into qt-release

Change-Id: I5ab2d3310556705368b4eca20538d18e0f3d5ef4