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

Change-Id: I993978f286bcba93f425a92a0bc828bbf20b87b5