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

Change-Id: I32cdf9d27f2fca93d988c66fa6cae19909793b75