Merge cherrypicks of [9756048, 9757193, 9757194, 9756382] into qt-qpr1-b-release

Change-Id: I396ae852300c48f1b9c4d3dd6ab27ae9ba068236