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

Change-Id: Id2728e9ad4f7e70dbd9882ddc6fb8eac2f438112