Merge cherrypicks of [12777987, 12777647, 12777988] into rvc-qpr1-release

Change-Id: If36adda49c1db4ad0ec78b7ce32242ea01890881