Merge cherrypicks of [8362518] into qt-release

Change-Id: I806700f24586b9c1be5edea1c47a18e1b3319a80