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

Change-Id: Iadf7e0bd680e6095514d66050c31a0453106cdd9