Merge cherrypicks of [15581403, 15581423] into rvc-d2-release

Change-Id: I96f38558daa4ad4b0880c31cc53b39f3edd3977d