Merge cherrypicks of [12777987, 12777647, 12777988] into rvc-qpr1-release

Change-Id: Ide9d1a65310754581fc6c6787f89a6d6f2e8c774