Merge cherrypicks of [19008482] into sc-platform-release.

Change-Id: I1fc0f977510919179e8ee8e1d240d8b9e9ca2507