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

Change-Id: Iee3631780d9c73eb051fc34faf80720432ac0eaf