Merge cherrypicks of [8002638] into qt-release

Change-Id: I455d0ec59fc4804c82076f77b46bf6f8fb5243b2