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

Change-Id: I066e036ba9c4a5b99ddcd4e9a45b5b7c1fda8dcb