Merge cherrypicks of [9452330, 9452331] into qt-release

Change-Id: Ic9467e91b31095b86071b72c4d8d50725ac04f2a