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

Change-Id: Ic8ac4bbe79832e7b371a2046b2608d7e5acb3a52