Merge cherrypicks of [13096720, 13097192, 13097193] into rvc-qpr1-d-release

Change-Id: Ib826fc238085aea78db8022da4b83a76790f0e63