Merge cherrypicks of [7798124] into qt-release

Change-Id: I418dfc38af2887f5884c5fd4fca5bb018d577dcf