Merge cherrypicks of [8943691, 8943693] into qt-release

Change-Id: I18db5ed890671b17c80acc71b0ab23e78b6c585b