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

Change-Id: Ic9f86f6fa0f977306747f07a6bf878aaf4901bbc