Merge cherrypicks of [9374574] into rvc-release

Change-Id: I0a6583685dadab9ad113da855d260719b86c901e