Merge cherrypicks of [10384223, 10378222] into rvc-release

Change-Id: I64466d813796501a11cb853f337aa1e908c320db