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