Merge cherrypicks of [11485997] into rvc-release

Change-Id: If8c9d0a281540b6bc9cea745a4d8ff5e0e0dd661