Merge cherrypicks of [5122841, 5122842] into qt-release

Change-Id: I8bff34c637b81b7cb86c5c9a8e739ed7e70b4bf4