Merge cherrypicks of [7625433] into qt-release

Change-Id: I6f5e2dbabb26c5c38c4a0b872f0adf8e553e2ef4