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

Change-Id: I6358c251d061931c013eb23dc67432f12c7cd2ad