Merge cherrypicks of [9736158, 9736323, 9736226, 9736227, 9736476, 9736477, 9736478, 9736176, 9736136] into qt-qpr1-b-release

Change-Id: I37a1974faabff389449ab547d92ffeca604284d8