Merge cherrypicks of [16740114, 16740115, 16740116, 15829070, 18029505] into sc-platform-release.

Change-Id: I118d84e5ea5eebf0d2f8a8c2201a780ad66737fc