Merge cherrypicks of [9201404] into qt-release

Change-Id: Ie491575f45eb7885eb00854f7e28657d0a783e08