Merge cherrypicks of [5938973] into qt-release

Change-Id: I606f0555aeff7a629cdc29bddd2bff20df52af9a