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

Change-Id: I92298fef5b5c8625dce5a3e1ebee38ed16bd400d