Merge cherrypicks of [19747493, 19748339, 19680238, 19698974] into sc-platform-release.

Change-Id: Ie9a327bd75dae3623d04b6ade10a1652cec090b3