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

Change-Id: I18f161e33959ea6adcbd1be28d84ddc1057a502e