Merge cherrypicks of [10908792, 10908752] into rvc-release

Change-Id: I4357262bff7d45505a84c6bbea97b57bdd32ba87