Merge cherrypicks of [11223240, 11219447] into rvc-release

Change-Id: Id1b8ec49023274da1d15db975b5abb00931a4a6e