Merge cherrypicks of [12770580, 12770581] into rvc-d1-release

Change-Id: I67fd0e5f4638f75f3b167c19a3d29ea915a8e1be