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