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

Change-Id: Idd1ce18dbd2fc300f4f807962729fd6ff3bfe3ff