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

Change-Id: I76d22b5d83a203901d0fd40bf1a4bd91e3cf3a5e