Merge cherrypicks of [9390149, 9390052] into rvc-release

Change-Id: I146e15690f15197a6324bee068a4a1f83e677a19