Merge cherrypicks of [10795594, 10795595, 10795596] into rvc-release

Change-Id: I5727c8d91447c5cc1ef31a83b048a540b6349404