Merge cherrypicks of [10735612, 10734887, 10739937] into rvc-release

Change-Id: I6b76b96cb1f8a0f9fbc605d548442aeac41a931f