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

Change-Id: Icbb681b322324c04648965083cee5f46ae5ba153