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

Change-Id: I196b9a4517e26b45f5583e48088f7e3004d2cd8c