Merge cherrypicks of [13350686, 13350303, 13350687, 13350304] into rvc-qpr2-release

Change-Id: I763403e87631efb7434bffac3d0b0c6c47149e51