Merge cherrypicks of [12272490, 12271819, 12272351] into rvc-release

Change-Id: I09f3317186343b8677816c7713b8fa7af0180d45