Merge cherrypicks of [10604824, 10605819, 10605820, 10602363] into rvc-release

Change-Id: I55be8f686c53a908ab973151413d131d3c158477