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

Change-Id: Ic079a96902cd782517d5a41767d85d36001349cd