Merge cherrypicks of [10952653, 10952654, 10951296, 10951297, 10952655, 10952671, 10952672, 10952367, 10952368, 10952673, 10948550] into qt-d4-release

Change-Id: I47401c9dbdefda549c1cd28ffd98cede7e2ce09a