Merge cherrypicks of [9739536, 9739043, 9739695, 9739046, 9739505, 9739506, 9739507, 9739047, 9739615] into qt-qpr1-release

Change-Id: I546ae464b87479b1bf180a48380a706f966959b8