Merge cherrypicks of [12982162, 12984235, 12984148, 12984149] into rvc-qpr1-release

Change-Id: Idd5e332200277408c505e08f5b9ec6932f32b9b7