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

Change-Id: I3acb845abccd1de7a288df0e35a9af88582f4788