Merge cherrypicks of [12991948, 12991950, 12991951] into rvc-qpr1-release

Change-Id: I2f5b1c6935bed2ba57a0fb9ab7ff77d571a1cfa8