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

Change-Id: I947f89e6736ae39f921a6a5e9c74a39e57584c48