Merge cherrypicks of [12806217, 12806235, 12806255, 12806040, 12806041, 12806042, 12806026] into rvc-qpr1-release

Change-Id: Ie30df76b6f873e5b5056969aff7dcd0845e311ec