Merge cherrypicks of [9513175, 9513021, 9513295] into qt-qpr1-release

Change-Id: Ib86b158e0d92dd8298439ec849c442ac79494d88