Merge cherrypicks of [12681083, 12677975] into rvc-d1-b-release

Change-Id: I6a2a77026d853474cf9a95f06df5142d64147f92