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

Change-Id: I10c22cbab8da6717c0f961bc4c0d189c817b9418