Merge cherrypicks of [19217852, 19693696, 20035263] into sc-v2-platform-release.

Change-Id: I87ac741a8154f0ca082edefb7616faaef524c9e3