Merge cherrypicks of [9276932] into qt-qpr1-release

Change-Id: Ia5c393762c6ec71387ab5fe3713253188469341b