Merge cherrypicks of [19946225] into rvc-platform-release.

Change-Id: Ia798bb216734c39b5054b690640d97b14cdde494