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

Change-Id: Iaea6c8747d5b0f77f5de503ece421f763dda085d