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

Change-Id: Icfe1cd1afe9e2c77e566278c22891010dc244d02