Merge cherrypicks of [9739231, 9739679, 9739582, 9739066] into qt-qpr1-b-release

Change-Id: Id70cb6a90b3aad2e0da0fef979bff291d96d8d3f